From 6861a5d0a4e90f38c91081f6c6ee8c1532f5e122 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 26 Oct 2016 20:58:07 -0400
Subject: [PATCH] Spacing fixes for builtin dialogs

Replace border-width and padding by margins, in most places.
---
 gtk/ui/gtkaboutdialog.ui         | 3 +++
 gtk/ui/gtkcolorchooserdialog.ui  | 2 ++
 gtk/ui/gtkfilechooserdialog.ui   | 1 +
 gtk/ui/gtkfilechooserwidget.ui   | 3 +++
 gtk/ui/gtkfontbutton.ui          | 2 ++
 gtk/ui/gtkfontchooserdialog.ui   | 2 ++
 gtk/ui/gtkinfobar.ui             | 3 +++
 gtk/ui/gtkpagesetupunixdialog.ui | 2 ++
 gtk/ui/gtkplacesview.ui          | 2 ++
 gtk/ui/gtkprintunixdialog.ui     | 7 +++++++
 gtk/ui/gtksearchbar.ui           | 1 +
 11 files changed, 28 insertions(+)

diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index aaa9ac20f8..c5c4f7082d 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -24,11 +24,13 @@
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
+        <property name="margin">5</property>
         <child>
           <object class="GtkBox" id="box">
             <property name="visible">1</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
+            <property name="margin">5</property>
             <child>
               <object class="GtkImage" id="logo_image">
                 <property name="visible">1</property>
@@ -170,6 +172,7 @@
                                 <property name="orientation">vertical</property>
                                 <property name="row-spacing">2</property>
                                 <property name="column-spacing">8</property>
+                                <property name="margin">5</property>
                               </object>
                             </child>
                           </object>
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index 0bcc50ae10..436a2653fc 100644
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -9,10 +9,12 @@
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
+        <property name="margin">5</property>
         <child>
           <object class="GtkColorChooserWidget" id="chooser">
             <property name="visible">1</property>
             <property name="orientation">vertical</property>
+            <property name="margin">5</property>
             <property name="rgba">rgb(255,255,255)</property>
             <signal name="color-activated" handler="color_activated_cb" swapped="no"/>
             <signal name="notify::rgba" handler="propagate_notify" swapped="no"/>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index 9cf195dad0..73bcd1919f 100644
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -11,6 +11,7 @@
         <property name="orientation">vertical</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="margin">6</property>
             <property name="layout-style">end</property>
           </object>
           <packing>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 42545de942..8ff35f3390 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -54,6 +54,7 @@
                               <object class="GtkBox">
                                 <property name="visible">1</property>
                                 <property name="spacing">6</property>
+                                <property name="margin">6</property>
                                 <child>
                                   <object class="GtkPathBar" id="browse_path_bar">
                                     <property name="visible">True</property>
@@ -93,6 +94,7 @@
                                 <property name="visible">1</property>
                                 <property name="no-show-all">1</property>
                                 <property name="spacing">6</property>
+                                <property name="margin">6</property>
                               </object>
                               <packing>
                                 <property name="name">location</property>
@@ -103,6 +105,7 @@
                                 <property name="visible">1</property>
                                 <property name="no-show-all">1</property>
                                 <property name="spacing">6</property>
+                                <property name="margin">6</property>
                                 <child type="center">
                                   <object class="GtkSearchEntry" id="search_entry">
                                     <property name="visible">1</property>
diff --git a/gtk/ui/gtkfontbutton.ui b/gtk/ui/gtkfontbutton.ui
index f247e01fce..ac72a85519 100644
--- a/gtk/ui/gtkfontbutton.ui
+++ b/gtk/ui/gtkfontbutton.ui
@@ -11,6 +11,7 @@
           <object class="GtkLabel" id="font_label">
             <property name="visible">1</property>
             <property name="label" translatable="yes">Font</property>
+            <property name="margin">5</property>
           </object>
           <packing>
             <property name="expand">1</property>
@@ -33,6 +34,7 @@
               <object class="GtkLabel" id="size_label">
                 <property name="visible">1</property>
                 <property name="label">14</property>
+                <property name="margin">5</property>
               </object>
               <packing>
                 <property name="fill">0</property>
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
index 78e766dc22..ff5a9573eb 100644
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -8,11 +8,13 @@
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
+        <property name="margin">5</property>
         <child>
           <object class="GtkFontChooserWidget" id="fontchooser">
             <property name="visible">1</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
+            <property name="margin">5</property>
             <signal name="font-activated" handler="font_activated_cb" swapped="no"/>
           </object>
           <packing>
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
index f3bacb2714..4fa4b9efd0 100644
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -12,6 +12,7 @@
               <object class="GtkBox" id="content_area">
                 <property name="visible">1</property>
                 <property name="spacing">16</property>
+                <property name="margin">8</property>
                 <property name="hexpand">1</property>
               </object>
               <packing>
@@ -22,6 +23,7 @@
               <object class="GtkButtonBox" id="action_area">
                 <property name="visible">1</property>
                 <property name="spacing">6</property>
+                <property name="margin">6</property>
                 <property name="layout-style">end</property>
               </object>
               <packing>
@@ -32,6 +34,7 @@
               <object class="GtkButton" id="close_button">
                 <property name="can-focus">1</property>
                 <property name="relief">none</property>
+                <property name="margin">6</property>
                 <property name="valign">center</property>
                 <style>
                   <class name="close"/>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 0954cd590b..e273f64259 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -32,11 +32,13 @@
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
+        <property name="margin">5</property>
         <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">1</property>
             <property name="row-spacing">6</property>
             <property name="column-spacing">12</property>
+            <property name="margin">5</property>
             <child>
               <object class="GtkLabel" id="printer_combo_label">
                 <property name="visible">1</property>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 2765d08feb..8977e512dc 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -22,6 +22,7 @@
         <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
+        <property name="margin">18</property>
         <child>
           <object class="GtkLabel">
             <property name="visible">1</property>
@@ -282,6 +283,7 @@
             <property name="visible">1</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
+            <property name="margin">12</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">1</property>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 11aae486a9..a0e4235946 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -73,6 +73,7 @@
                     <property name="visible">1</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
+                    <property name="margin">12</property>
                     <child>
                       <object class="GtkBox" id="box2">
                         <property name="visible">1</property>
@@ -430,6 +431,7 @@
                     <property name="visible">1</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
+                    <property name="margin">12</property>
                     <child>
                       <object class="GtkBox" id="box4">
                         <property name="visible">1</property>
@@ -855,6 +857,7 @@
                   <object class="GtkGrid" id="job_page">
                     <property name="row-spacing">18</property>
                     <property name="column-spacing">18</property>
+                    <property name="margin">12</property>
                     <child>
                       <object class="GtkBox" id="frame_template5">
                         <property name="visible">1</property>
@@ -1188,6 +1191,7 @@
                             <property name="visible">1</property>
                             <property name="row-spacing">6</property>
                             <property name="column-spacing">12</property>
+                            <property name="margin">12</property>
                           </object>
                         </child>
                       </object>
@@ -1220,6 +1224,7 @@
                             <property name="visible">1</property>
                             <property name="row-spacing">6</property>
                             <property name="column-spacing">12</property>
+                            <property name="margin">12</property>
                           </object>
                         </child>
                       </object>
@@ -1252,6 +1257,7 @@
                             <property name="visible">1</property>
                             <property name="row-spacing">6</property>
                             <property name="column-spacing">12</property>
+                            <property name="margin">12</property>
                           </object>
                         </child>
                       </object>
@@ -1284,6 +1290,7 @@
                             <property name="visible">1</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">18</property>
+                            <property name="margin">12</property>
                           </object>
                         </child>
                       </object>
diff --git a/gtk/ui/gtksearchbar.ui b/gtk/ui/gtksearchbar.ui
index 93bd05df68..7b520bd74a 100644
--- a/gtk/ui/gtksearchbar.ui
+++ b/gtk/ui/gtksearchbar.ui
@@ -10,6 +10,7 @@
           <object class="GtkBox" id="tool_box">
             <property name="visible">1</property>
             <property name="spacing">6</property>
+            <property name="margin">6</property>
             <child>
               <object class="GtkBox" id="box_left">
                 <property name="visible">1</property>
-- 
2.30.2